bitkeeper revision 1.1159.170.101 (41ebbffd4FxrNM4pQF5Ip7nRjrUUjg)

Merge font.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into font.cl.cam.ac.uk:/local/scratch/sd386/xen-2.0-testing.bk

diff --cc .rootkeys
Simple merge

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/libxc/xc.h
index c4440d9838f3bc68717ede961f84917524605174,badfbb375d728abd8041d8d3e307d356d0665727..159e71fb454a324e9eb5a6353a60e64a11378938
--- 1/tools/libxc/xc.h
--- 2/tools/libxc/xc.h
+++ b/tools/libxc/xc.h
@@@ -241,24 -132,15 +241,32 @@@ int xc_rrobin_global_set(int xc_handle
  
  int xc_rrobin_global_get(int xc_handle, u64 *slice);
  
+ int xc_sedf_domain_set(int xc_handle,
+                           u32 domid,
+                           u64 period, u64 slice);
+ 
+ int xc_sedf_domain_get(int xc_handle,
+                           u32 domid,
+                           u64* period, u64 *slice);
+ 
  typedef evtchn_status_t xc_evtchn_status_t;
 +
 +/*\
 + * EVENT CHANNEL FUNCTIONS
 +\*/
 +
 +/**
 + * This function allocates an unbound port.  Ports are named endpoints used for
 + * interdomain communication.  This function is most useful in opening a
 + * well-known port within a domain to receive events on.
 + *
 + * @parm xc_handle a handle to an open hypervisor interface
 + * @parm dom the ID of the domain.  This maybe DOMID_SELF
 + * @parm port a pointer to a port.  This is an in/out parameter.  If *port is
 + *            0, then a new port will be assigned, if port is > 0 then that
 + *            port is allocated if the port is unallocated.
 + * @return 0 on success, -1 on failure
 + */
  int xc_evtchn_alloc_unbound(int xc_handle,
                              u32 dom,
                              int *port);

diff --cc tools/python/xen/lowlevel/xc/xc.c
Simple merge

diff --cc tools/python/xen/xend/XendClient.py
Simple merge

diff --cc tools/python/xen/xend/XendDomain.py
Simple merge

diff --cc tools/python/xen/xend/server/SrvDomain.py
Simple merge

diff --cc tools/python/xen/xm/main.py
Simple merge

diff --cc xen/common/schedule.c
Simple merge